[IA64] Remove unused contig mem flag for VTi

Remove the confusing flag ARCH_VMX_CONTIG_MEM for VTi domain. And add a
flag ARCH_VMX_DOMAIN to ensure VMX_DOMAIN check on all vcpus.

Signed-off-by : Zhang xiantao <xiantao.zhang@intel.com>

diff --git a/xen/arch/ia64/vmx/vmx_init.c b/xen/arch/ia64/vmx/vmx_init.c
index 8cd3501ed9e7de634b06eb624e4ada81b16b4b3d..febb66f5d64c84e5e67759d6629ac5abe846594f 100644 (file)
--- a/xen/arch/ia64/vmx/vmx_init.c
+++ b/xen/arch/ia64/vmx/vmx_init.c
@@ -300,6 +300,8 @@ vmx_final_setup_guest(struct vcpu *v)
 
        /* One more step to enable interrupt assist */
        set_bit(ARCH_VMX_INTR_ASSIST, &v->arch.arch_vmx.flags);
+       /* Set up guest 's indicator for VTi domain*/
+       set_bit(ARCH_VMX_DOMAIN, &v->arch.arch_vmx.flags);
 }
 
 void
@@ -337,7 +339,6 @@ static void vmx_build_physmap_table(struct domain *d)
        struct vcpu *v = d->vcpu[0];
        struct list_head *list_ent = d->page_list.next;
 
-       ASSERT(!test_bit(ARCH_VMX_CONTIG_MEM, &v->arch.arch_vmx.flags));
        ASSERT(d->max_pages == d->tot_pages);
 
        /* Mark I/O ranges */
@@ -393,7 +394,6 @@ static void vmx_build_physmap_table(struct domain *d)
        list_ent = mfn_to_page(mfn)->list.next;
        ASSERT(list_ent == &d->page_list);
 
-       set_bit(ARCH_VMX_CONTIG_MEM, &v->arch.arch_vmx.flags);
 }
 
 void vmx_setup_platform(struct domain *d)

diff --git a/xen/include/asm-ia64/vmx_vpd.h b/xen/include/asm-ia64/vmx_vpd.h
index d3f15f35cf63389cca640a626441e9c1f5b362d4..e4ef5e9a317a7b7bbe1e0fbbf35b818727306f91 100644 (file)
--- a/xen/include/asm-ia64/vmx_vpd.h
+++ b/xen/include/asm-ia64/vmx_vpd.h
@@ -106,7 +106,7 @@ struct arch_vmx_struct {
 
 #define ARCH_VMX_IO_WAIT        3       /* Waiting for I/O completion */
 #define ARCH_VMX_INTR_ASSIST    4       /* Need DM's assist to issue intr */
-#define ARCH_VMX_CONTIG_MEM    5       /* Need contiguous machine pages */
+#define ARCH_VMX_DOMAIN         5       /* Need it to indicate VTi domain */
 
 
 #define VMX_DEBUG 1